[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE...

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

am skip reason: subject contains skip directive

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

Change-Id: I66300e7dd5b9b36d4a05be95115cc100dcdfe0a8