[automerger skipped] Fix: VPN is off but key is displayed in the status bar am: eeaf855751 -s ours am: bcb42f11e6 -s ours
am skip reason: Merged-In I1c19eb33f0c1d0f1ccca6ac17a709f8bc1ad9f94 with SHA-1 2518198630 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23909322
Change-Id: Id8306c8ac8dcce1783b8b7012d353a8dae3ec175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: