Move NFC/eSE settings

Bug: 196825539
Test: build pass
Merged-In: I590f069139f641d886e1252e3acdb19483b7fcaa
Change-Id: I590f069139f641d886e1252e3acdb19483b7fcaa
11 files changed