Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c4...

Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c4 am: 77cbfcd9 am: c6952e05 am: b3bb4cfe am: d25574f3 am: 5be3efe8

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



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