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

Change-Id: Ib5df8e0d31858b309bcd3110d553ab9415e6a9e8