Fix restricted switch layout for small screens

The support library Preference class has code which hides the reserved
space for icons on small screens when there is no icon, but it expects
the icon container to have the id 'icon_frame', and our custom layout
was using a different id.

Bug: 111318404
Test: visual (set display size to Larger or Largest, and visit Developer
options; the Stay awake and OEM unlocking switches should be aligned the
same as other preferences without icons)

Change-Id: I1b5ac43851d77b87fe01f8267bb50ea23086e262