[automerger skipped] Merge "Fixed that out of service in latest service state"...

[automerger skipped] Merge "Fixed that out of service in latest service state" am: 2c542468 am: 4f1541a5 am: 26cf0b1c am: 697753de am: e956f1bc -s ours

am skip reason: Merged-In I7c834c2b14d1aaf9e8474c9812f97643bf79b833 with SHA-1 86644f1e is already in history

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

Change-Id: I43b896fb9b4fe3273d14a89e0634ddaca2c33900