[automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -s ours am: 6524622d0f -s ours am: 7ecf2cf1a7 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I988e8a4b397af4360da97e97c79307ba62b155f6
tree: e6266bc78f78a74fe41c1ad7bc539bc6f08ecf9e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS