[automerger skipped] Merge "Handle empty battery level" into tm-dev am: 95e5f0ab am: 9156d28a -s ours am: 6bf78eb3 -s ours am: f21f646c -s ours

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

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



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