Merge "Allow carrier-privileged apps access to TelephonyManager APIs."
am: 810644cecb

Change-Id: I0d9ba0e89b500a25baf94ca497b4427d54f57ee3