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

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

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



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