Merge "BLE scan filter setup simplification (1/3)"
am: 452dc05ff0

Change-Id: Ie73fd42405f98b2cb96d05bdc5c2a06a7b811cdd