[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 93a76f8e40 -s ours

am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

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

Change-Id: I72cd2486ff8473dcbdef76bc855e4fe45927b943
tree: 9c75452dde0a4bd533511398eb3a4cd4845db50d
  1. core/
  2. services/
  3. tests/