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

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

Change-Id: If457f847d8f9a5ce0f717300cabea7a6aab92953