[automerger skipped] Add a new NFC developer setting option for NFC vendor...

[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f179404 am: 0797feaf am: 86a6c6a9 -s ours

am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff89 is already in history

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



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