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