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

Change-Id: Ibbe6a90b7f0d47ea3af9324f84eac90ec036326a