Merge "Reduce NTP polling interval" am: 77da69b764 am: 4c89f808f1 am: 81755b8b4b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007251

Change-Id: I2c54e916b51a0f34712a0eb36195d9cd4c7d075a