Snap for 11051817 from 0d2a8a694291be691be13131d43a17cb0ca7fcc9 to mainline-appsearch-release

Change-Id: I3308abf5645a877586f321d842dac09e33da3370