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

Change-Id: I92ca90c34a9fadeabf324a84ec41772dcdebc57f