[automerger skipped] Merge "Refactor nfc preference controller" into pi-dev am: 2357c1cd84
am: 6c1c1a6a50  -s ours

Change-Id: I1b904418b7e704f2cfb3545740c0954b86026b30