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

Change-Id: Icdea68073697b9e815ea33ab3eada1b134b67fba