Merge "Merge "Modified text to cancel enrollment" into qt-r1-dev am:...
Merge "Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3 am: cbeeed99" into qt-qpr1-dev-plus-aosp
am: cd7f47f5
Change-Id: I1ecd3d66a6bb9b007f99db3cb584e44cde5d0b0e