[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours am: 4c05b195d7
-s ours am: a66212e11d
-s ours am: 697a73dfdf
-s ours am: c12e5f2455
-s ours am: ea699a1d2c
-s ours am: a68dc4738b
-s ours am: 8b8290a8e5
-s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I84562bae14e97cffa8b224b83dd7cf80c06fc460
This commit is contained in: