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

Merge "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" into udc-d1-dev-plus-aosp am: e92c23e0

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



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