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

Merge "[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: 430a2a84 -s ours" into udc-dev am: 601850b8 -s ours

am skip reason: Merged-In I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d with SHA-1 27faa572 is already in history

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



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