Merge "WifiConfiguration: Modify time display in toString" into pi-dev am: 1024314c67
am: 230f737932

Change-Id: Ieb7376c15c51515204ead93109a0d04f8aff9c2a