[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: b67a5b50 -s ours am: d4aa3fc3 -s ours am: 9b4ec0cd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0a78302d9356077442675cbd512eab75ee5ba2fc