[automerger skipped] Merge "Handle empty battery level" into tm-dev am: 95e5f0ab -s ours am: 49c5ac27 -s ours am: 140e60a4 -s ours

am skip reason: Merged-In I0ef3906dac9ce3928e238a056e5ed9d0cc760a4e with SHA-1 b4afde73 is already in history

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



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