Fix batterystats update on sensor connection cleanup am: 7be8557f40 am: a8f3fd4eba

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

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