Merge "Reschedule timeout when accessibility event occurs" into udc-dev am:...

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

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



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