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

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



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