[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours am: 301610b8c6 -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: I4f023fd4fe72b6254cf51af02ca8bd5967e49549
tree: 9bf4c026f812cb1d1d9896c6a6e3a7634edcca49
  1. core/
  2. services/