[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 skip reason: Change-Id I775a1697595929aaf1258d48f45676ec18065cff with SHA-1 23f26916 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ffa0943185872ac912a203a794f07d9c65f23af