[automerger skipped] Merge changes Icb91de93,I5a2edaf4 am: 2430a04b am:...

[automerger skipped] Merge changes Icb91de93,I5a2edaf4 am: 2430a04b am: 7638a61b am: 58d90a42 -s ours

am skip reason: Merged-In Icb91de934181a8b6f085e03a0ce8c5e08504ff94 with SHA-1 440ff967 is already in history

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



Change-Id: Ib2d13f8a3ef6b3e6414c683da1a673e10f225c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>