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

Change-Id: I1fb398c2200e8a358c6576a31e3e84d141a8101e