Merge "Reschedule timeout when accessibility event occurs" into udc-dev am: b2998a4c am: 41f45549 am: be2ae74f am: 9fa91386

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



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