commit f2e4cc90374212c62b72bc877a1a86d349f303d9
author Paul Stewart <pstew@google.com> Mon Dec 19 08:45:32 2016 -0800
committer Hugo Benichi <hugobenichi@google.com> Tue Dec 20 12:31:49 2016 +0900
tree 100f6bfdc4e562568be3fe96f335f3c3df9686ce
parent d7423d12a96b2c83b17b875385a3646a90633675

DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java

Commit 51727428fcfa9e09bfd70e710ceef02325994942 added a string
format which caused an exception.  On top of the fixes to this
from 5a453273522e6b60ccb2d9098faf9fa95bc27da8, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit e46b47d85d9a241a0f7d74c6d20e573f73d8c2c3)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36