Merge "Consolidate testing for input changes" into tm-dev am: 648717a3 am:...

Merge "Consolidate testing for input changes" into tm-dev am: 648717a3 am: 978c20b8 am: a2436c7e am: 8d64c685

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



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