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

Change-Id: I3ea0257deb116f89aa62afd49fd4daefb8a782d5