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: 4039d649 am: 64782a30

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



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