Merge "SnoopLogger: Debug enhancements settings" am: 07044e05c3 am: c00ae11c86

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

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