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

Change-Id: Idf378e9a99f7980eabfb0737b28b4185fd7dd931