Merge "Don't show no sim when a sim has been detected." into oc-mr1-dev
am: dddbb2261c

Change-Id: Ic6154e7b2e10d8b538ca466f3cd38ded953a3dbd