[automerger skipped] Merge "Mark override carrier id broadcast as protected" am: 156afaff02 am: 08addeda7a am: 5932cc299e am: 9faa8c504b -s ours

am skip reason: Change-Id I7d932b432f4eea9a0727029f20129d8f85115d3e with SHA-1 2ae61300b3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1470544

Change-Id: I43e34bec0ebc5ddb1f60cefd6684d28c74e443c2