Merge changes Icb91de93,I5a2edaf4 am: 2430a04b2e

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

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