Merge "Update dark theme battery info error text color" into sc-dev am:...

Merge "Update dark theme battery info error text color" into sc-dev am: 501a4cea am: 20a0b2ac am: 6db68218

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

Change-Id: I7b6a0be2d091824996bce67b6c4032fae6de357b