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

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



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