Merge "Redirect references to OTASP_ Constants to TelephonyManager"