Merge "Add tests to ensure input settings are loaded on boot" into udc-qpr-dev am: 6f780529

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



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