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

Change-Id: Ie6935d39d89ca7a61e3031f74a4998add71928ec