Merge "Snoop Logger: fix descriptions" am: d7780a2fe3 am: a4875f76c5

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

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