Merge "Merge "Fixed time zone issue after out of service" into rvc-d1-dev am:...

Merge "Merge "Fixed time zone issue after out of service" into rvc-d1-dev am: 29552447 am: a48ede68" into rvc-qpr-dev-plus-aosp am: 8c03c1b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/12122276

Change-Id: I1c04c5c3b9c9f590cd038d1576f44a6e539f50d2