Snap for 8736029 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-appsearch-release

Change-Id: If5af650bbf4ed9f69872d9dcafb9239ad945fe8c