[automerger skipped] Revert^2 "Move out allowlists for...

[automerger skipped] Revert^2 "Move out allowlists for com.android.cellbroadcast" am: 73c22ade -s ours am: 280d1884 -s ours

am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020



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