[automerger skipped] Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b am: 2a82a4f3b1 -s ours

am skip reason: Merged-In I132a1558ea67400d9c10dda523456f99eb815b92 with SHA-1 934b0bb739 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

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