Merge "Batterystats track background bad ble scan time" into oc-dev am: fe06de1fc2
am: 41e3f1479c

Change-Id: I3e9425e32d72b7415e776076cb977716073eb921