Merge changes from topic "fix-apexkeys" into main am: 78a658b81f am: 65ecec24c8

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

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