[automerger skipped] Merge "Support multi-SIM entitlement check" am: 8fee3dee71 am: 761e51482d
am: dca42fb0cf -s ours
am skip reason: change_id Icbfa8e84d675c95c0c5563087490ca8e36d91b73 with SHA1 293422f1d0 is in history

Change-Id: Ice4d404eaad1632196b245be7cd07c2325451fde