[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: 16b802de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7cb0a454500946192868d746e97fb47a657af777