Merge "skip permission check for TelephonyManager API getMmsUserAgent"
am: b017b0dac4

Change-Id: Ic3a41c7d9ffacbbc1ed1f296ed2e541add75b5ee