[automerger skipped] Merge "Migrate VpnSettings from...

[automerger skipped] Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev am: 80539477 am: c9eca99a -s ours

am skip reason: Merged-In I26531afe75215c9531c0122d2e86fd5d0da4d3db with SHA-1 f9ca5692 is already in history

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



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