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

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

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

Change-Id: Iaa0c765388e4447ffe6c7641d1edb9b0fdd20588