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