[automerger skipped] Merge "Do not share key mappings with JNI object" into...

[automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a8 am: 83d362e9 -s ours am: 458c17a5 -s ours am: bda1982e -s ours

am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0 is already in history

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



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