Merge "Fix icon touch dialog in Enrolling page" into udc-dev am: 3e41d936

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



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