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

Change-Id: Ieeba20fffda6ea0ef8a7c77bada495f4608d1f97