Merge "Revert "For 1 sim devices, hide signal empty state"" into qt-r1-dev
am: 0bb77bda15

Change-Id: I9a52b09e2ef58416da548fe13792ac4889e22c7b