Merge "NITZ API improvement" am: bb347323d0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1839798

Change-Id: Ia5d297d7692f14bcd761b8b9a42e927270c2ee38