Revert "Improve BLE scan attribution to facilitate debugging power issues"
am: 2e20779b97

Change-Id: I4165ae5a023c57a3ac46d71afeffa26be1fd3f94