am f963136e: am 4bf3f39c: am 22172323: Merge "Adds the BIND_CARRIER_MESSAGING_SERVICE permission to the phone process, so that platform telephony components can communicate with the carrier app." into lmp-mr1-dev

* commit 'f963136ec7110705a8e1e93329fe18a3de721f49':
  Adds the BIND_CARRIER_MESSAGING_SERVICE permission to the phone process, so that platform telephony components can communicate with the carrier app.