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

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

Change-Id: Ide683e8e8ea53c1bd5c279fbe9f41e38552ad990