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

Change-Id: I456f660a5e336b7151469b904bed92b4cbd617b7