Snap for 10453563 from 3b7f7bfd6d1c5f562ff473742c441bee70090cd7 to mainline-appsearch-release Change-Id: I34801d5c4d59776e22aecf2f5cec0f2e5e856266