Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main...

Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f am: 6fb6ccd5

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



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