Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574 am: 749b03d2e6 am: f39900d8b2 am: 92a9270571 am: 00b4d82125

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

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