[automerger skipped] Merge "Fix "No service" is not shown without SIM" into...

[automerger skipped] Merge "Fix "No service" is not shown without SIM" into rvc-qpr-dev am: 9145c526 -s ours

am skip reason: Change-Id I8115fdd0b4760069a309a55ddd8b579785d7ce46 with SHA-1 250fb97f is in history

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

Change-Id: I86c46c2487c07936c9c4b8be6a5a79eaa4694dc4