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 am: f35b1be8 am: f06564ca

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



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