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: e86146d6

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



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