Fix batterystats update on sensor connection cleanup am: 7be8557f am: 34c3e548 am: fa1e2cec

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



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