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