Merge "skip permission check for TelephonyManager API getMmsUserAgent"
am: 4a864b8d96

Change-Id: I41dc53cb76bbb8a8bc239bb6e2c2779a9cd100bd