aml_ase_341310010 (11179056,com.google.android.appsearch)
Snap for 10453563 from f1e31ae6ed39c2c8a91fa7ac3755464e70b124ed to mainline-appsearch-release

Change-Id: Ic3674e5708578393e16afd18ea4d93501195e1bb