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

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

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



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