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

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

Change-Id: I33edb19d4b6145f39e1ea43499d98fedfb0f1548