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

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

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