[automerger skipped] Merge changes from topic "nfc_logging_control" am:...

[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a am: 4886f28a am: 6a703151 -s ours am: fd0203ee -s ours

am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe3 is already in history

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



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