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: ec0e5675 am: 862c659c

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



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