Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f39001

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713



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