Merge "Maintain keyboard configuration and reload layouts if changed" into...

Merge "Maintain keyboard configuration and reload layouts if changed" into udc-dev am: ec725e14 am: 5dd01001 am: cde1c325

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



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