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