Merge "Use the custom name in the battery attribution if it is unknown item"...

Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433 am: 7511d1ed

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



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