[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 147752d32e -s ours
am skip reason: Merged-In I0327322074e9540a08c5d592bef26cacadfb923b with SHA-1 929b7cb069 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/15571797
Change-Id: I8450b8d893a52a52460cd37cdbbf9346c040d9be
This commit is contained in: