[automerger skipped] Merge "Snoop Logger: fix descriptions" am: d7780a2f am:...

[automerger skipped] Merge "Snoop Logger: fix descriptions" am: d7780a2f am: a4875f76 am: 60c1d392 am: 96d94102 am: 6390bf32 -s ours

am skip reason: Merged-In I5bc9d5a9942a958491a319a800a9668c6793cf6c with SHA-1 043a3e49 is already in history

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



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