Merge "Add unoptimized ble scans to batterystats CTS test" into oc-dev am: baf6bbad0d
am: 7474b3d438

Change-Id: I31f5d8b6b30dd4f4628a4ab8b57f9566577e5683