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

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

Change-Id: Ief3ecec9e1c12d1dbd7691e7965f0430692a4f9b