[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: 3b351adb -s ours

am skip reason: Merged-In I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4b is already in history

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

Change-Id: I4e3e52cd50b10c22c15f5692611ee2fc2d4fb633