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 am: 86f36a03 am: 54354124 am: 0577ca8d

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



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