[automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours

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

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

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