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: 46169304 am: 0c3b784d am: 24f4c18d am: 371f8aaa

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



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