Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be am: 1325de7875 am: 5bb48d9250

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

Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>