Merge "Allow carrier-privileged apps access to TelephonyManager APIs." am: 810644cecb am: 72a5f23ceb  -s ours
am: 9aa4148462  -s ours

Change-Id: If72851d346f11bc68e519228aa853cd3f67c4cfd