Merge "Remove redundant baseline apex_available entries" into main am: 6f9522e4 am: a6a7872b

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



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