Merge "Makes Assistant handles comply with a11y timeouts" into rvc-dev am: aad7d93e am: d3a79681 am: f27c3745 Change-Id: Ibc83ae197c218d5537542a21cdded551e88522e9