Merge "Track BLE Scanning statistics by UID instead of by package name" into oc-dev
am: 5bdc2bfcdf

Change-Id: I6b3ccd12a644b4c830cee6feba2dfca1c2f3f99c