Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f am: bc08889feb

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

Change-Id: I7d2cf24adabc90a1446be0f261888c24b77b494b