tree 6b130ea82109d1c7c4f1a98a6443cffe69087816
parent 34a34c8f1f1f451728e94e938bcda196565fe740
parent 8f2b1ad855515b7b50b218c965958ab18345fe95
author Treehugger Robot <treehugger-gerrit@google.com> 1615458536 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615458536 +0000

[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