Merge changes from topic "merge-input-config-feature-tm" into tm-dev am: d7a879e6

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

Change-Id: I569d13e950298a8fd9c35c664d39ac6814f6fd3c