Merge "Fix abnormal wake up caused by WifiConnectivityManager"