Merge "Change the logic of getting ntp server" am: 7024d920 am: bb601496...

Merge "Change the logic of getting ntp server" am: 7024d920 am: bb601496 am: 19f12168 am: 4b188825 am: 0251d25f

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

Change-Id: I362e6d5bce64f60b2b1443e53a7a3566c5d747fc