[automerger skipped] Merge "Add a has-carrier-privileges shell command." am: 2a7c295927 am: bb93ed2886 am: 8f2b1ad855 -s ours

am skip reason: Change-Id Id3eb88801848f00438114d8a1e00039935ede621 with SHA-1 b6907bdfee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I225691f84de1d894bc48face24e3501e94620f80