[automerger skipped] Merge changes I4e7a7ac5,I0c73361b into sc-dev am: f7a62e6c -s ours

am skip reason: Merged-In I4e7a7ac5495d2e622ba92a4358ed967e066c6c2e with SHA-1 78349b56 is already in history

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

Change-Id: I87b7f1523efeff2b9e03d586f382d08ecdf5aeca