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

Change-Id: I7c18d0aab6dfe5a0ddc3a44e7053fb21d9d440da