Merge "Change NetworkTimeUpdateServiceImpl behavior" am: 48247d9223 am: f11a45b756

Change-Id: Ie3b6457ba196f7aa00ffb6e2fa77e5acbb926374