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

am skip reason: subject contains skip directive

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

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e