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: 4039d649 am: 64782a30 am: f7db07a3" into udc-d1-dev-plus-aosp am: fa54a0fe

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



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