Merge "Remove battery usage column icon (1/2)" into sc-dev am: f969007c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I655d0326c8e8a7faff6e2254562aa1808344e4e4