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

Change-Id: I44a3c8657199dcac010785c607f9c2aabeda8d6e