[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b661 -s ours am: 13b5cdb38a -s ours am: 42a50bd598 -s ours am: d723156cbc -s ours am: 616b5cf6e6 -s ours
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: Ia234c795a9861c766266a08cb09335bdc3c8e2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: