Merge "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" into oreo-mr1-cts-dev