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: f97a1948 am: 0d430952

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

Change-Id: I1231d929dec144c221fa7dc02b128c4c574045f8