[automerger skipped] Merge "Reland aosp/1535007:" into stage-aosp-master am:...

[automerger skipped] Merge "Reland aosp/1535007:" into stage-aosp-master am: 9c98aa88 -s ours am: 57df633d -s ours am: 60bb26e6 -s ours

am skip reason: Merged-In I50911f727ba98df1035500dbbf467b849be8d6c2 with SHA-1 ea50a050 is already in history

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

Change-Id: I92e559ade48528304053c374b030a1e24625f27c