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

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



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