Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a
am: 79867a16fb

Change-Id: I7f0de294357ae6c691d38be52dd278eb37d42116