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: I1c32bbc3844bd7f6ffe665875263303acb175f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>