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

Change-Id: I61e76b03486c9d35afdd2e2c6acb5db5a6b2916f