am d43d9a87: am 261ef07b: (-s ours) am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev

* commit 'd43d9a8776b7388cb933c7866166a806b5c2a9e2':