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

* commit '261ef07b6f5c324e809d40d4e87786fb83f9644a':