Merge "Always show disabled pSIMs in single-sim mode" into qt-dev am: cd07aa1cc4
am: 4d9ff1e113

Change-Id: I7b0a4bd4d0ac01c17998784bbf8ff49e025a28a6