Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev