Bug: 62912136 Test: Existing tests in BaseSearchIndexProviderTest Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
Bug: 33279975 Test: make RunSettingsRoboTests Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b