Merge "Adapt scan settings based on client state."
am: ceba91f888

Change-Id: I8db384e3763f10239d525cd7c5caf629d25995c7