Merge "BatteryStatsService: Fix wrong arguments passed to noteBluetoothScanStoppedFromSourceLocked." am: 97f4c617 am: 295fde95 am: 93265532 am: b50303cb am: 5681af59

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



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