[automerger skipped] Merge "skip permission check for TelephonyManager API getMmsUserAgent" am: b017b0dac4 am: a38b7fd154 -s ours
am: 7332add606 -s ours
am skip reason: change_id I4d41e96de6662e9d16825554192114d74afb8551 with SHA1 d5ca2d5418 is in history

Change-Id: Ie4f79956cefcfe990431a902eda8ec4520097cc9