Merge "Don't load battery entry names and icons in offline job to improve...

Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c

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



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