Merge "Ensure that autohide accounts for accessibilty timeout override" into...

Merge "Ensure that autohide accounts for accessibilty timeout override" into tm-qpr-dev am: a2d33b1a am: f301e20b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20901502



Change-Id: Ic2d8c54ea0c062ebed8af722f9d93dedc3220b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>