Merge \\"Update SyncManager min period to match JobScheduler\\" into nyc-dev am: 166b0abf13
am: 24d50f8f0a

Change-Id: I2788a38bd8ea77df847444556f4ca7a98c5c956e