[automerger skipped] Merge "Output apkcerts file for android_app_set." am:...

[automerger skipped] Merge "Output apkcerts file for android_app_set." am: 5aff3afc am: 694a75c6 -s ours am: e5e011ff -s ours am: 8037c900 -s ours

am skip reason: Change-Id I321e80fd636a955213761f56a3ac64bfe7f7f7c0 with SHA-1 8bec026e is in history

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

Change-Id: I928467ef4b8c622426c2e0a29edd0075e54be9dd