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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f21f8288cee454ddabd06844d038041cef8afc4