[automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am:...

[automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am: 5ae099b9 -s ours am: 9ad5faa9 -s ours

am skip reason: Merged-In I8b62b9b9d7ae271bc623764d545db1320b4dc64f with SHA-1 6624e2aa is already in history

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

Change-Id: I67a30e269da1df1dc163ffd987d64e9cf3368964