[automerger skipped] Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged"...

[automerger skipped] Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged" into stage-aosp-master am: ae356a63 am: 54ba3513 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176358

Change-Id: Ifdb563c339711e641530fe1e30289d7b66ca5759