Snap for 10453563 from 7a4fff11b2488fb070fb45e4b892c7d2a1ad40dc to mainline-appsearch-release

Change-Id: I3ca98c0be5332af3a3c0aec2a51d89f152dc75b5