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

Change-Id: Ibeab832cd2cb326f90b02cdcd53be03819799d75