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

Change-Id: Ib50ad719e8fbeae089b902ef49627465bf9814c3