Merge "Re-enable dynamic UICC idle timeout switching." into jb-mr2-dev