Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master