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

Merge "[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: baf0b865 -s ours am: c93d0f50 -s ours am: 5fa491d5 -s ours am: b2fcb236 -s ours am: f51e507c -s ours am: 8d51b1d6 -s ours am: 25d7e5cb -s ours" into udc-qpr-dev-plus-aosp