Merge "Support multi-SIM entitlement check" am: 8fee3dee71
am: 761e51482d

Change-Id: Ifd5cd819311f2901f4d344121b4cf5a9ab6a6118