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

[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b6 -s ours am: 13b5cdb3 -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: I8113a8eb77c95938bf86ce2f8ac13692524dfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>