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

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



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