Merge "Only set the vonr setting when sim state loaded" into udc-qpr-dev am: 0f9f50c8

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



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