Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev am: aaf3860941 am: 4c0900102b
am: 52c78bd5a2

Change-Id: Idd3e5b3677866fc5286bb94d12e921e70d641e9f