Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87

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

Change-Id: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c