Merge "Change the logic of getting ntp server" am: 7024d9205b am: bb601496d3 am: 19f12168d1

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

Change-Id: Id2cd86988e17ad916907122d4d71adb673191029