[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: e8130209b4
-s ours
am skip reason: Merged-In I6998afd2638ea87773ed52a90b7ec62d5abebc14 with SHA-1 4841f6ffda
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16278329
Change-Id: I018756740ad8d6ae622a0206a356d38728aa372c
This commit is contained in: