[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: f2a516095e -s ours am: f4f6e27ce7 -s ours am: f60bb2159c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I149c09d4ed3cbcb06afd2afb839986ce48bb6f93