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

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



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