Merge "Prioritise NTP over NITZ in time detection." am: a36c8d2b6a am: fe18f9b37f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ac4bb6cd48c9be18062a1f34a4f73449d828b3a