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