Merge "Fix theming on Forgot your password work challegne screen" into...

Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce am: daf168e2

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



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