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