[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am:...

[automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: a0f0a5b9 am: 0e1a12fa am: 15f2597f -s ours am: 6c2d03f6 -s ours am: b575b665 -s ours

am skip reason: Merged-In I4397ae1c055beca71998ce598ff489ecd4241dc1 with SHA-1 99a7e497 is already in history

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

Change-Id: Id1b5acd9a675292599d161869c8e159bf32d361e