Merge "Synchronized WifiTracker scan result cache update logic" into qt-dev am: f34f600c70
am: 343ffacebe

Change-Id: Id839ba48865967bb6c72e1361633eb6cf4256e00