Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39c

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



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