Bug: 62912136 Test: Existing tests in BaseSearchIndexProviderTest Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
Bug: 34774945 Test: make RunSettingsRoboTests Change-Id: Ie5e113a6df85bab5be50c947bd7b91cfacdccb7f