* For fix the conflicts in pi-dev, cherry pick the commit 86d3e58c8d in master and merge the conflict. * Add @SearchIndexable in PreviouslyConnectedDeviceDashboardFragment.java * Move save device group to "Previously connected devices" preference Bug: 74134939 Test: make -j60 RunSettingsRoboTests Change-Id: Iff7894033df402d42dcc0ccaea6db3106edb7013 Merged-In: Iff7894033df402d42dcc0ccaea6db3106edb7013