Merge "Fix emergency button not visible on pattern work challenge screen" into udc-dev am: 01b382546e am: e86146d685 am: ca697c000a am: 1a883223d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23631338 Change-Id: I66013972ab62e4eef4b592b2a65844f89ecd6c31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: