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

Change-Id: I0d785910f27847b2d5629f2651fab29f5a332424