Merge "Improve BLE scan attribution to facilitate debugging power issues am:...
Merge "Improve BLE scan attribution to facilitate debugging power issues am: 30803361 am: 2ab197da" into oc-dr1-dev-plus-aosp
am: 3dc91fe5
Change-Id: I519e1d431db2a07556a0b87d0eafa5e5c16fc9d2