Merge changes I831da5fa,I866916c9 am: c66769ddd9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icae891ef2e16df3db3ac4c4d9f670cda89c5cc57