Merge "Move SIM select logic from SimSelectNotification to Telephony." am: 6fca0c9495
am: d42dcf04db

Change-Id: I5f57320b1ad10e5207771bae0495eac656240a02