Merge "Revert "Use framework-appsearch-stubs instead of framework-appsearch""