aml_ase_341113000 (10817827,com.google.android.appsearch)
Snap for 10453563 from 8e9a212552c9096cfeccaacd65dea1d1bca88107 to mainline-appsearch-release

Change-Id: I7fbdb52c3ed3d2bbdb8735e4f58d2a0172a7a608