Merge "Fix SearchScaffold flaky when close search box" into udc-qpr-dev am: b1b715c8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23807527



Change-Id: I2e278c33442e61570973d46ad0fdf64a2c1a48e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>