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

Change-Id: I98348e3a0994bc123085dc67084cf38e48ae2b7e