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