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

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

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



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