Merge "Fix lint error getSystemService for EuiccManager"