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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ca42e15d94b41311b2c7f5f6d2d996a2d9fa6b3