Merge "Redirect references to OTASP_ Constants to TelephonyManager" am: eaf2153484 am: 3ab9f412fa am: 341be101ca
am: 7171a1f611

Change-Id: Ibfe160d81fd5d0433d9b9153f8e0b98f722870ae