Merge "Add a has-carrier-privileges shell command." am: 2a7c295927

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0469b1e9f69af23a7c3f78d44149869538b9e24