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

[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 24e69068 -s ours am: f7c7a1ee -s ours am: 4e62ea7a -s ours am: 096f5c88 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34667ff6c400d0a248f841179b6fa08685ac19ec