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 am: 540e5fe2 am: 49272a77 am: 305ab817 am: 8cf15ac6

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



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