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

Change-Id: I29f94cf764209d8325c29ed8ea9c1d73a34194b7