Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab5 am: 749b03d2

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



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