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

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

Change-Id: I12a979da7ab3259b935632bf809a0c4db57ba1bc