Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev am: afd8d9e2b2
am: 5c1469e5cc

Change-Id: I0fb64287061f5323db066b484db7b96b5f1979ea