tree ffc267f183e93ca56fa85eff3ef67954fd457455
parent e13123f06ee3f19653b4b80156354aebed429f21
parent e49d624d70bdda89be9646fe7ea935f4cd13a671
author Android Merger <noreply-android-build-merger@google.com> 1553547064 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1553547064 +0000

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