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

Change-Id: Ie73f95f4605a894bf040da2dbb5d9ef6b1bd071a