aml_ase_340913000 (10529129,com.google.android.appsearch)
Snap for 10453563 from ded301a650f1bec1f62d01c1e8436db6e61b7111 to mainline-appsearch-release

Change-Id: I8f07ede156bd16ea42c961f91d61fcdb0ab285d8