Merge "Reschedule timeout when accessibility event occurs" into udc-dev am: b2998a4c am: 688c9be1 am: 23e2e3bd am: b34ea521

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



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