Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev