[automerger skipped] Merge "skip permission check for TelephonyManager API...
[automerger skipped] Merge "skip permission check for TelephonyManager API getMmsUserAgent" am: 4a864b8d
am: 8baacff5 -s ours
am skip reason: change_id Ib9f211120c34e9b48c02f990088c32fb307a64f2 with SHA1 48781653 is in history
Change-Id: I5f1e2e34c6d8a60bd5a0c3598af2b33ee585172c