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

[automerger skipped] Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-dev am: d530cd1a am: 393f374f -s ours am: 7ba46d7f -s ours am: 7b6b4fec -s ours am: b61a643b -s ours am: e7786409 -s ours

am skip reason: subject contains skip directive

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



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