Snap for 10453563 from 6d7f987710eebdcc6b7b0180f50eb65086f06dd7 to mainline-appsearch-release

Change-Id: I77c55c43ba7d21f222919edd2765c4aaa8a73a73