bacon: Update NFC configuration

Change-Id: I3a29c6f6d950f191cc755a8e27a9a052017c32dd
bacon: Revert ULL feature for now

 * There are a bunch of issues with this feature currently.
 * Will revisit later.

Change-Id: I34bfee0cd9e7cf7f1252a1b092477f7f3eaeb1df
Merge remote-tracking branch 'CM_device_oneplus_bacon/cm-11.0' into cm-11.0