Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp
am: c8d5463923

Change-Id: Ia3e0d750ab8f7541700b2a99b3b10bea2b826565