Fix batterystats update on sensor connection cleanup am: 7be8557f am: a8f3fd4e am: c1150a3b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18191640



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