Merge "Stop unfiltered BLE scanning on screen off"
am: 258f385b43

Change-Id: Ice9cb0dd6c69954f9639115e87353f0d3596793f