[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e -s ours am: 065dbb1c -s ours am: 49ceda90 -s ours am: 542c1fec -s ours

am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4839c9b3f214a0311c287761ec6e8fb6411f58a4