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