Merge "Change NetworkTimeUpdateServiceImpl behavior"
am: 48247d9223

Change-Id: I299a69b5a3abf5da66237f79aa7ca56b6268452a