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

Change-Id: I88bc26bde6d3d03bd8af1876e01cdb39e0c85f91