[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 4e9b8886c5 -s ours am: 1f28a72dd9 -s ours
am skip reason: Merged-In I815ef03c93bec8be2340dc340d840895f47ecafe with SHA-1 4bb39c56da is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15571673
Change-Id: Ia1f714dace095a3079331bc051009baaea15e744
This commit is contained in: