Snap for 10453563 from f7aad3d1e2958b3a98d50359d18c270ee978bca7 to mainline-appsearch-release

Change-Id: I73482879959f118445d5a2f693cf440baff1336f