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

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

Change-Id: I53b5765f78098e466379454d228dda47cc007aa9