aml_ase_340913000 (10529129,com.google.android.appsearch)
Snap for 10499635 from 1500162a42f0abe90f6e9afde24a5b1d1bd16338 to mainline-appsearch-release

Change-Id: I5db41dd58abf968a0f1db5112d09dd0143602d45