am ff321d4: Merge "VPN: silence VPN notifications." into ics-mr1

* commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b':
  VPN: silence VPN notifications.

Author: Chia-chi Yeh

services/java/com/android/server/connectivity/Vpn.java

@@ -322,7 +322,7 @@ private void showNotification(VpnConfig config, String label, Bitmap icon) {
                     .setContentTitle(title)
                     .setContentText(text)
                     .setContentIntent(VpnConfig.getIntentForStatusPanel(mContext, config))
-                    .setDefaults(Notification.DEFAULT_ALL)
+                    .setDefaults(0)
                     .setOngoing(true)
                     .getNotification();
             nm.notify(R.drawable.vpn_connected, notification);