From: Charles He <qiurui@google.com>
Date: Tue, 19 Sep 2017 08:17:12 +0000 (+0000)
Subject: Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f
X-Git-Tag: android-x86-9.0-r1~378^2~2^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=551fb6ba845c032e8dbdf2e4b83ea895bee671aa;p=android-x86%2Fframeworks-base.git

Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f
am: 01014743c0

Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57
---

551fb6ba845c032e8dbdf2e4b83ea895bee671aa