[automerger skipped] Merge "Add privapp permissions permission for...

[automerger skipped] Merge "Add privapp permissions permission for com.android.cellbroadcastreceiver package." am: fb723fab am: b65eff6a -s ours am: 08fbfc82 -s ours am: cdd44514 -s ours am: 7de4a496 -s ours

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

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

Change-Id: Idd059aca569300d7be4f78adbcafa59f8fe0b827