[automerger skipped] Merge "Only set the vonr setting when sim state loaded"...

[automerger skipped] Merge "Only set the vonr setting when sim state loaded" into udc-qpr-dev am: 0f9f50c8 am: 84e47512 -s ours

am skip reason: Merged-In Id0bd0ac0916332a4f95a056de3c47acc888a9a20 with SHA-1 73fafe12 is already in history

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



Change-Id: Ieed5ed6eb2aaf3d2b5f97eb93ec599c817becd6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>