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

Change-Id: Ic9abc5fda12605806a56b5bb96a2830cbfa610b0