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

Change-Id: I5ddc0d20c96439328c37d0a49f7fa6c4c90d6e14