Merge "Fix: VPN is off but key is displayed in the status bar" am: b31cf50a...

Merge "Fix: VPN is off but key is displayed in the status bar" am: b31cf50a am: b164a01f am: 941ecbfe am: 28c850bc am: dca6b585 am: 91128568

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



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