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

Change-Id: Ia3b7a9ae3aca80d54cb536886a864a66db15f567