Merge "Remove empty baseline apex_available maps" into main am: 896e3846 am:...

Merge "Remove empty baseline apex_available maps" into main am: 896e3846 am: e66ea3a3 am: 9617660f

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



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