Merge "Nuke old setAlwaysOnVpnPackageForUser method."