Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e
am: e86146d685
am: f35b1be8ac
am: f06564cad0
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>
This commit is contained in: