Merge "Update test to not assume 2 max SIMs" am: bd9ff62138 am: 932c9e0b99

Change-Id: I328c03c0437ed2142e4c316e2d06d916b6d4be70