Merge "Add Indexable.SearchIndexProvider.getNonIndexableKeys(Context)"