Merge "Fix other String.format issues in NetworkNotificationManager.java"