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: 4b1ff71a

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



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