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 am: eef001af

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



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