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

Change-Id: I797007708f03e21e4e687ec6cb1d932b5b8d7af1