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

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



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