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

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

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

Change-Id: I7210bb74378f0bcc925c46f3c75d83fc8aa8741d