[automerger skipped] Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131
am: c6d8ef82c4
-s ours
am skip reason: Merged-In Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f with SHA-1 061a87fe1f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096
Change-Id: I8b3040f4bc83b7055431c07d1305f1a9519c9cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: