[automerger skipped] Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" into rvc-dev am: b1b08a0d -s ours am: d4ed8dcb -s ours
am skip reason: Change-Id Ie9e5127742beba04f1c191e894e8a29fe1e704bb with SHA-1 3077996e is in history
Change-Id: I8e6ce89799a71549f66692d7c512ac54d5eb4ab8