Merge "NITZ API improvement" am: bb347323d0 am: 4d791aef1b

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

Change-Id: I4c33c1e3214fbc837ad43b6ca3b0e3b27f52dbe4