[automerger skipped] Merge "Add tests to ensure input settings are loaded on...

[automerger skipped] Merge "Add tests to ensure input settings are loaded on boot" into udc-qpr-dev am: 6f780529 am: b8540e47 -s ours

am skip reason: Merged-In I023e5c1ef44367c2147978acae5f225c9f50f11c with SHA-1 9544afb1 is already in history

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



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