Merge "Unifying source of statsd BleScan calls and cleaning it up." am: 056a095dd3 am: 7ed0147613
am: 18852e3636

Change-Id: Ifcc5f22a921f6f4d50eb47a329aa2e3db61410ef