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

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

Change-Id: Icc4bc5711db083a14cb15443ebc6fbf046042c58