DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java am: 8e21030679
am: d0d9493102  -s ours

Change-Id: I3e94a34a2065939094f17f48383e2d9334d22f55