[automerger skipped] Merge ab/7061308 into stage. am: be473bf8 -s ours am: 6c90c4e5 -s ours am: 5075d304 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b53494c1c76586d716b25ab576d5f272aeb3488