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

Change-Id: I399d41ceb45a2edab28e23a9227e2b7302918beb