Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN...

Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589



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