Merge "NITZ API improvement" am: bb347323d0 am: 4d791aef1b am: 66b9465fc8 am: 1050f3afcc

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

Change-Id: Ifc796c69d88e6af0cbdcbe95ac584c0454117a1d