Merge "Allow carrier-privileged apps access to TelephonyManager APIs." into pi-dev