Merge "Deprecate resId field in SearchIndexableResources"