Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247 Change-Id: I7ac6eadaf67b235c67f9b1c4b037e7f725ef8644 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: