Merge "Recursively list Android image contents." am: fa8fce55 am: 9b6a0a2b...

Merge "Recursively list Android image contents." am: fa8fce55 am: 9b6a0a2b am: d103706b am: 724b274d am: 5123899a

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



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