[automerger skipped] Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1 am: dc6a11a82a
am:ee0740c4d6-s ours am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA16ddff97414is in history Change-Id: I7315d98a6c905e915611d95364215bdc2341b4e4
This commit is contained in: