Merge "Batterystats handles nested unoptimized ble scans"
am: 4627c01ee4  -s ours

Change-Id: I044d02d6b00f63573870643ad83fce11740dd498