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: If1f8a496fc6fec8419619d9c399bddb21bfcc232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>