Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4  -s ours am: 2fd6b1d7cd  -s ours
am: 9fccdd14e5  -s ours

Change-Id: I593da51c7664d76c1ad64859823d434f4ce414fa