Merge "Modernize BLE Scanner implementation (1/3)" am: 6cab9cb65a am: ad7024a4f1 am: 80fc5e29d0
am: b1b48e8490

Change-Id: Id459da0eb191020bdeb926f0aaebf4c735e0681b