Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774

Change-Id: Ica601a83a63c10f7c6403634e0fd5a4db63b3865