am 348039f5: (-s ours) am 284504f8: Merge "Fix permissions on TelephonyManager" into mnc-dev

* commit '348039f5c8e88a140d570f277791945e2b259b47':