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

Change-Id: I0ca587378c1db327c4e73b18ab5c1c2505f05ce0