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

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe -s ours

am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109e is already in history

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

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3