Merge "Snap for 13219944 from 693124d7c11cb7b5e7e2aaaf409a8f6b0235c2b5 to androidx-appsearch-release" into androidx-appsearch-release