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

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



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