[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 skip reason: subject contains skip directive

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



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