Merge "Replace ConnectivityManager constants to TetheringManager" am: 0728d22b39 am: 13a0da47dc am: 66ba1fb6aa

Change-Id: I0180fe011062a11d7cc925bced8d8178fa3dcc63