DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java am: f2e4cc9037
am: 3d205c909c  -s ours

Change-Id: I3e94a34a2065939094f17f48383e2d9334d22f55
tree: a7cc2edcf81156b32b6915459024d506c6314023
  1. core/
  2. services/
  3. tests/