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

Change-Id: I8844baee35d3597ba314e9542eea47f590c45dab