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

Change-Id: Ied0f4683311276d2c643e882f57f8a21943aebe3