Merge "Remove parameter from stopVpnRunnerAndNotifyAppLocked()"