Merge "Support delete and query messages in SIM for Multi-SIM devices" am: a5031646c6 am: a3609eb79b am: 3a4d570c70

Change-Id: I8a80bb0835c26eba535f112a610e148e5fb92020