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

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



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