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

Change-Id: I29a15a2a9f05572e4e5c3327249f71bfa213d776