[automerger skipped] Merge changes I0c80b546,Ibc673303,I70317eb8 into sc-dev am: 55d7ed4b -s ours

am skip reason: Merged-In I0c80b546a814d799562f374148eae5ca23b0e1f8 with SHA-1 1b784a7c is already in history

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

Change-Id: I1b1fd4fe33db92ce18279c14c9db0c4d7b26af34