Merge "BatteryStatsService: Fix wrong arguments passed to...

Merge "BatteryStatsService: Fix wrong arguments passed to noteBluetoothScanStoppedFromSourceLocked." am: 97f4c617 am: 295fde95 am: 93265532 am: b50303cb am: 31db11eb am: 9a1ad42d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063308



Change-Id: I8f3397d58f1b8b8f30906993a2432f00a4c5e512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>