Filter devices by UUID and then class.

The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.

Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59