Merge "Remove the task of SIM Toolkit when it becomes no longer needed" am: 8134527ab4 am: 27a54d1806 am: f6ddc0c0ad
am: be099055eb

Change-Id: Ib6bf5e1de97bc7b5686796936714c52e02cc38d3