Merge "Send ble scan type to Batterystats" into oc-dev am: b4650c79c6
am: 996875a59e

Change-Id: I0d1ffe7f00a68cb5a2b5b9bade4c3289f2622194