Merge "Update battery error layout" into sc-dev am: 431e77d429
am: 80bb5b005e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14758085 Change-Id: I6d835f4202e10457860fd449ee8c4fe552b01e21
This commit is contained in: