Merge "Merge "Fix WifiTracker keeps sacnning even if onStop() is called." into qt-dev am: 4719d033c7" into qt-dev-plus-aosp