[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev am: dea6865011 -s ours

am: d3e6645e75 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
This commit is contained in:
Varun Anand
2019-03-22 12:37:54 -07:00
committed by android-build-merger

Diff Content Not Available