Merge "Fix emergency button not visible on pattern work challenge screen" into...

Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b38254

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



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