[automerger skipped] Fix: VPN is off but key is displayed in the status bar...

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

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

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



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