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: I81b6e72ddae9049ee9b237747ffacae987bf67b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>