Merge changes Ifd3117a4,Ic4f8b2b1 am: dfd4c8b8 am: 4892bade

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



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