Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use mTelephonyManager to test the testHasCarrierPrivileges()" into nougat-cts-dev am: 3d65dc94cc -s ours am: 558f0582f5 -s ours
am: 43a605cf04 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d56801c43fd5c1373e5fa44e6344890e851c8cc