Bug: 62912136 Test: Existing tests in BaseSearchIndexProviderTest Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
Fix: 34205150 Test: make -j40 RunSettingsRoboTests Change-Id: I7a8a0c89c087365fb50f3a9edd2cf64b2dda647c