[automerger skipped] Merge "Move SIM select logic from SimSelectNotification to Telephony." am: 6fca0c9495 am: d42dcf04db
am: 33aba7c0d0 -s ours
am skip reason: change_id I6153e27dd00dd9cdf8682f135eb39f8af3a75608 with SHA1 41855ec8b9 is in history

Change-Id: I8b50c0da43c795b0db04a695b3242136fd6d936c