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

Change-Id: I0a3b744623f5c372ae3be24064c63d455bd1a2c1