[automerger skipped] Merge "Revert "settings(dev): Remove NFC stack logging...

[automerger skipped] Merge "Revert "settings(dev): Remove NFC stack logging control"" into 24D1-dev am: 1df6f6a9 -s ours

am skip reason: Merged-In I3c6026e230c7d35f04d9771442fadbf040a84b94 with SHA-1 a5bd1cf3 is already in history

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



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