[automerger skipped] Merge "Merge RQ2A.210305.007" am: 48172e9b5d -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: 6c03bd4e38257b64ec78dd66c99a9665f68c802e
  1. framework/
  2. service/
  3. OWNERS