Merge "Redirect references to OTASP_ Constants to TelephonyManager" am: eaf2153484
am: 3ab9f412fa

Change-Id: Ibe284d39fb0aba9e54165e713d80bed8ca8edec8