[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 23f26916 -s ours am: 9c4a8e5f -s ours am: 4b1a37bb -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a9c3aeb8dd44688961d88653305e2e922d44e7d