[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 88b7d7f0d7 -s ours

am skip reason: Merged-In I05a0c2f49b9859f14df182bea5a9c3b44ce9b53d with SHA-1 7c5af76027 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/15571893

Change-Id: Iaa517c1373f5aad1a775cc54b4926f3777f96c1a