[automerger skipped] Fix: VPN is off but key is displayed in the status bar am: eeaf8557 -s ours

am skip reason: Merged-In I1c19eb33f0c1d0f1ccca6ac17a709f8bc1ad9f94 with SHA-1 25181986 is already in history

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



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