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

Change-Id: I5f7de66fc08a945d8078c17cac39415ddc76fc42