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

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



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