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

Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb am: 4909b810 am: b6e44d16 am: 957ece69

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

Change-Id: I159684580a0f018e7d41dc2982c7d7001e88cf55