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

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

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



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