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