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

am skip reason: Merged-In I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31 with SHA-1 beb6fb7493 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1699954

Change-Id: I5e1a3d6ed6e5d9e3f393270e2851d14ddfcb7b3e