[automerger skipped] Merge "Sanitize VPN label to prevent HTML injection" into...

[automerger skipped] Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab5 am: 749b03d2 am: f39900d8 am: 92a92705 am: 00b4d821 am: 1d32ff85 am: fb8a2bf7 am: fe7e0f64 am: 1ee94520 -s ours am: 568438e6 -s ours

am skip reason: Merged-In I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d with SHA-1 2178216b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002



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