Merge changes from topic "fix-apexkeys" into main am: 78a658b81f am: 4bd01fe80a

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

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