[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
am: 9d5a7aa322
am: 59463e3e04
-s ours am: 744dd99af4
-s ours am: dcc3304de4
-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/+/14167797
Change-Id: I478e925228c82ff1c1aa5f0cc1dfbb9defdff32b
This commit is contained in: