Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 am: 45512c8b0c am: 6cfb908ca5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825 Change-Id: I26df04ca46607752f791181cb1ccac376018818e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: