[automerger skipped] Merge "Fix NFC state switched off every time user entered...

[automerger skipped] Merge "Fix NFC state switched off every time user entered connection preferences page am: e4c2e427 am: dc29b325" into qt-r1-dev-plus-aosp
am: 771b5468 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1 6ddff974 is in history

Change-Id: I8b4127787401f6d5d9384021f7e78da2c173a6ee