Merge "Remove redundant baseline apex_available entries" into main am:...

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

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



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