Merge "Refactor nfc preference controller" into pi-dev
am: 2357c1cd84

Change-Id: I82c793a393ec8bd92f409743173ec79a8ba0387b