[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."...

[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: f2a51609 -s ours am: f4f6e27c -s ours am: f60bb215 -s ours am: c34fb629 -s ours

am skip reason: Merged-In If07afd9af680cd2a5ece6506df5383e5cc258663 with SHA-1 c9939063 is already in history

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

Change-Id: I49fa0c4f982f85c0a77143cb7f383c1a083aac57