[automerger skipped] [automerge] DO NOT MERGE:Deflaky...

[automerger skipped] [automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb am: a85abd57 -s ours am: 7f3dd285 -s ours am: 9d903936 -s ours am: 6d85caa4 -s ours am: 715ba04c -s ours am: 1f24e73f -s ours

am skip reason: subject contains skip directive

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



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