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

Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426