[automerger skipped] Merge "Fix TelephonyPermissionsTest for carrier privilege changes."
am: de0d7d14 -s ours
am skip reason: change_id If8dbd73e56676afb8eee9dedf60c2e16e5764f05 with SHA1 f258abbd is in history
Change-Id: If29ceba4d86c53dc31edbd580e0113c296c6481f