[automerger skipped] Merge "DO NOT MERGE:Deflaky...

[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-v2-dev am: b841118d -s ours am: 05a7678c -s ours am: a3a7aaac -s ours am: 70ab7339 -s ours

am skip reason: subject contains skip directive

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



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