Merge changes I093fbec4,Iee5c09d5 am: 1db9d96d6a

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

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