Merge "Remove CellBroadcast apps from baseline apex available map" am:...

Merge "Remove CellBroadcast apps from baseline apex available map" am: 34e0b948 am: 5b976679 am: 19913312 am: 040b98c2

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



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