Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1a

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



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