[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8f11dea13b -s ours am: 86285c8c6b -s ours am: b56074854c -s ours

am skip reason: Merged-In I36c46b79d83a295e79bb13250e39377cc4ffb62b with SHA-1 e55bd1cc18 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/build/+/15571855

Change-Id: I27b9ad4605d152e3a4460d15d48600f1c3ab9de2