[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours

am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history

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

Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a