Merge "multiSimAllowed should be consistent with max active modem property." into rvc-dev