tree 83b70edd688f86e883192a0f74e31e222fc4da31
parent 0b427fd333645935505bf58f8dfb22e8dacd2f75
parent c97f2a7c714a02983f1ab57e02725ab32c5bb701
author Pavel Grafov <pgrafov@google.com> 1548880087 -0800
committer android-build-merger <android-build-merger@google.com> 1548880087 -0800

Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040 am: 09aa059ec4
am: c97f2a7c71

Change-Id: Ib0d3fea2da62271ff7e9fc92738ae4b0a1270182