[automerger skipped] Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96 am: 74e3771df3 -s ours am: 9e0dea0c05 -s ours am: 3390caf31d -s ours am: 6ae8610b2a -s ours am: 34d59689a2 -s ours
am skip reason: Change-Id I3869326bdfb65368827f25469ae83539a68e171f with SHA-1 0304e5f90c is in history
Change-Id: Ib8fc23fd11ee94517be2bc1f581b5198a664dbfd
This commit is contained in: