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

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



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