[automerger skipped] Merge "Add BatteryServiceBinderTest" into tm-qpr-dev am:...

[automerger skipped] Merge "Add BatteryServiceBinderTest" into tm-qpr-dev am: 127a41aa -s ours am: 4282457d -s ours

am skip reason: Merged-In I06448f15e06663f1914c9277e7d30bd678fec475 with SHA-1 bcb8ade0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20832052



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