[automerger skipped] Merge "Add check on multisim modem capabilities." am: eb3a5fbf00 am: c2ce565364
am: 151f4cb2c2 -s ours
am skip reason: change_id I5c8fc3a86f79cf71d01dba20c2d1591f59b6ec58 with SHA1 4245e95076 is in history

Change-Id: I92dd6594f9df7a08788a9f552ae4ea5a384d3d4c