Merge "Remove ConnectivityManager.INET_CONDITION_ACTION reference" into sc-dev