Merge "Make getIEuiccContronller() protected and non-static for CTS." am: 2378a2ca0b
am: 24ba89dafe

Change-Id: Ia5313c8daab24242ae4a00bfdc23eb4f23634558