Merge "Disable restricted VPN actions onResume am: 52541536d0
am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp
am: d3dc50ceb1
* commit 'd3dc50ceb1b459178e998186d4c57a7225e72055':
Change-Id: I0c0db607b5373c450b045be3521ddd435f474272
This commit is contained in: