Merge changes from topic "merge-input-config-feature-tm" into tm-dev am: d7a879e665 am: 437a7bc165
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17050822 Change-Id: Idb775b230eb581fa8c3a063736f9cf9a2d2b5c76
This commit is contained in: