Fix 6535413: Fix overlapping controls in keyguard

It appears that rendering order changed in recent builds.  The
transport control used to work in HC and ICS.  In any case, the fix
is to swap the positions of the two widgets, which ensures the
transport control appears on top of the status area.

Change-Id: I312d0a83e7bebbdc57f037e732e371538a781e86