[automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -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: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
tree: 06ed93bcd09b0e9f8f5384bcf14cbb1dfa472e4a
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS