Merge "Changes event handling phases for DeviceListPreferenceFragment." am: 084c20409b
am: 015fe72cd3

Change-Id: Ice1275e292262a86caafe64d01676eaccad0f702