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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8487ff11d6930a43794e27891d377ca75de3f75