Merge "Move load battery consumer icon and label into the background" into sc-dev am: 648f773c7c

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

Change-Id: I6fa69766a4e8d7fb0332da7ba657a71207c24443