[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
am: 0797feaf7b
am: 86a6c6a9a7
-s ours am: 3c0d7c9bfb
-s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: I4efffbe58669c8546ba5ba316f8fc76455500606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: