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

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

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



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