[automerger skipped] Merge "DO NOT MERGE - Merge RQ1A.201205.011" into...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master am: 23526561 am: a0f8e819 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3e4c16190808daaded0e009d512fedc8ae6216e4