[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e7449820 -s ours am: 0595a3bf -s ours am: a75effc5 -s ours

am skip reason: Merged-In I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1 with SHA-1 5c822bf4 is already in history

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

Change-Id: I519efb7020c45035ce7aaadb9176621f01d01211