Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev am: aaf3860941
am: 4c0900102b

Change-Id: I72bd4d4769ac95b2ef2e78426cfa38c29c51ea6e