tree 7ddf35c3665c02ac032a59985c342195744edd6c
parent 2f040befbd02291e4e1e79574baf2fbe804cd0cd
parent d5444c9eb60e9cde936c9533a066910acc58eb49
author Varun Anand <vaanand@google.com> 1550232715 -0800
committer android-build-merger <android-build-merger@google.com> 1550232715 -0800

Merge "Update VPN capabilities when its underlying network set is null." am: e3ae238f4a am: d6d593572e
am: d5444c9eb6

Change-Id: I6dd5a369f1a3b74bbf498051ef1e4d1b31bd8e5e