[automerger skipped] Merge "skip permission check for TelephonyManager API getMmsUserAgent" am: 4a864b8d96 am: 8baacff5fe -s ours
am: 787511ed38 -s ours
am skip reason: change_id Ib9f211120c34e9b48c02f990088c32fb307a64f2 with SHA1 4878165365 is in history

Change-Id: I71d8dd6f70a30a98b6e5113c1f14ead147cd96bf