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: 41b9c55a am: 4c0a9340 am: 5be12f84

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



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