[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
am: 81f481fac4
am: 08c64a4414
-s ours am: bac3cfcbfe
-s ours am: 0800590570
-s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I71da2527a732bb5197d1938438987fdd1b973367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: