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

Change-Id: I0b892d4b45d0ece04642102ced0e50ef2b9698e7