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