[automerger skipped] Merge ab/7061308 into stage. am: e8cbbd6b6c -s ours

am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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