Merge "update time while network is connected"
am: 465f8527dd

Change-Id: I863c775015079a21098efd32b570acf8a8b53efa