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

am skip reason: subject contains skip directive

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

Change-Id: I857476e7dcefe71e430e282a75fd5ec67f4dbda1