Snap for 10453563 from 0d34fc6e420a76bcda5cc6a96aa922a5f188de7f to mainline-appsearch-release Change-Id: I4e11ac29ed71a40de382ed19671a860bff2a1cec