Merge "Manta: NFC: Re-enable UICC idle timeout feature." into jb-mr2-dev