Merge "[NFC] Add a picture under NFC settings to show NFC detection point."...
Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e am: 3283bf4c am: b882b03d
Change-Id: Icf55f1662d4cfe47f620d5a6bf2ca295285b30ce