[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am:...

[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f89449 am: 81f481fa am: 08c64a44 -s ours

am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640 is already in history

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



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