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

Merge "Consolidate testing for input changes" into tm-dev am: 648717a3 am: a7a3d50b am: 74b981aa

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



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