[automerger skipped] Merge "Add privapp permissions permission for com.android.cellbroadcastreceiver package." am: fb723fabac am: b65eff6a29 -s ours

am skip reason: Change-Id I7fd5080aa740fcfcebeb4f934d0a3fc39d847cc9 with SHA-1 8fe5465ada is in history

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

Change-Id: I0a7ce7068f8361441b3b405ee31d087d24f1e279