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

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



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