[automerger skipped] Merge "SnoopLogger: Debug enhancements settings" am: 07044e05c3 am: c00ae11c86 am: 24a8616927 -s ours

am skip reason: Merged-In Idbcfca91b9650684a26240ca8b767fecaa93da14 with SHA-1 524c24392f is already in history

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

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