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: eb9894cb -s ours am: c67fffa8 -s ours am: c3dc03ef -s ours am: ae55bc4e -s ours" into udc-qpr-dev-plus-aosp